Skip to content

[v35] Keep the player card off the open leaderboard from 1024px - #6165

Merged
evanpelle merged 1 commit into
v35from
cherry-pick/v35/pr-6157
Oct 26, 2026
Merged

evanpelle merged 1 commit into
v35from
cherry-pick/v35/pr-6157

Conversation

@openfront-backport

Copy link
Copy Markdown

Cherry-pick of #6157 onto v35. It conflicted, and Claude resolved it.

Conflicted files:

  • src/client/hud/layers/PlayerInfoOverlay.ts

Typecheck, format and lint pass on the result.

Check the fix before merging.

- Even with the clan column hidden (#6147), the centered player card
still covered about 65px of the open leaderboard on Poki's 1080p frame
(1031×580).
- From `lg` (1024px), where the leaderboard opens by default, the
leaderboard, the card and the timer sidebar (with the replay panel) now
share one top row in `index.html`. It's a 3-column grid,
`[minmax(max-content,1fr) | minmax(0,max-content) |
minmax(max-content,1fr)]`. When there's room the card stays centered as
before. Otherwise it shifts right to clear the leaderboard, and narrows
(`lg:max-w-full`) only if it would reach the sidebar. The card's
building-count boxes shrink a few pixels rather than wrap.
- Below `lg`, nothing changes: each piece keeps its own fixed position
(`max-lg:`), as on main. There's no shrinking and no vertical sidebar.
- The row is `pointer-events-none`. The leaderboard, the sidebar and the
visible card opt back in, so map clicks pass through the empty parts of
the row.

Headed Chromium against a local dev server, solo game, leaderboard open:

| Viewport | Leaderboard | Card | Sidebar |
|---|---|---|---|
| 1024×600 | 0–331 | 331–797 | 797–1024 |
| 1031×580 (Poki on 1080p) | 0–331 | 331–804 | 804–1031 |
| 1280×720 | 0–331 | 341–939 (centered) | 1053–1280 |
| 1920×1080 | 0–331 | 661–1259 (centered) | 1693–1920 |
| 836×470 (below lg) | unchanged from main | | |

- Hit tests at 1031×580: empty row space reaches `game-input-overlay`,
and the leaderboard and sidebar take clicks.
- `npx vitest run`: 9534 passed, 1 skipped. `npm run typecheck`, oxlint
and oxfmt are clean.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 9628a3e)

Conflicts resolved for v35 by Claude.
@coderabbitai

coderabbitai Bot commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 79b7dca5-326e-4982-87c3-742924abec7b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@evanpelle
evanpelle merged commit 2e389ff into v35 Oct 26, 2026
18 of 19 checks passed
@evanpelle
evanpelle deleted the cherry-pick/v35/pr-6157 branch October 26, 2026 22:13
@github-project-automation github-project-automation Bot moved this from Triage to Complete in OpenFront Release Management Oct 26, 2026

This branch was successfully deployed

1 active and 1 inactive deployments
backport — a8c03656 Deployed Oct 26, 2026 by evanpelle via Cherry-pick #626
staging — a8c03656 Deployed Oct 26, 2026 by openfrontio[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Complete

Development

Successfully merging this pull request may close these issues.

1 participant